3 commits

Author	SHA1	Message	Date
Calclavia	834ecd4ee5	Made eletric shock semi-working	2013-08-02 22:55:29 -04:00
Aidan Brady	3f37571b16	Finish merging repo into workspace	2013-08-01 23:54:38 -04:00
Calclavia	d6efc5540b	Got Tesla transfer working	2013-08-01 22:19:01 -04:00