heres your stupid name
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #29 from DevenSmith/master

5-9-2014 1053