Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen

author Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>

Sat, 9 Nov 2013 03:17:17 +0000 (19:17 -0800)

committer Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>

Sat, 9 Nov 2013 03:17:17 +0000 (19:17 -0800)
author Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
Sat, 9 Nov 2013 03:17:17 +0000 (19:17 -0800)
committer Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
Sat, 9 Nov 2013 03:17:17 +0000 (19:17 -0800)
diff --cc MarkSlee.pde
Simple merge
diff --cc _Internals.pde
Simple merge
author	Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
	Sat, 9 Nov 2013 03:17:17 +0000 (19:17 -0800)
committer	Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
	Sat, 9 Nov 2013 03:17:17 +0000 (19:17 -0800)
		1	2
MarkSlee.pde	patch \|	diff1 \|	diff2 \|	blob \| history
_Internals.pde	patch \|	diff1 \|	diff2 \|	blob \| history