4 commits

Author	SHA1	Message	Date
Aidan Brady	5a1e2fe6ff	Merge	2013-08-25 11:01:30 -04:00
Aidan C. Brady	5072b20673	Updated IC2 API, modularized energy management	2013-08-22 11:36:31 -04:00
Aidan Brady	cfc5dff445	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
Aidan Brady	b255a98a74	Rebase for new workspace (sorry)	2013-06-28 18:01:00 -04:00