Hey I'm a friggin retard!
made a comment
Writing comments like a boss
Merge remote-tracking branch 'origin/stupid' into stupid

Conflicts:
	mainCode
merged master and stupid