post github merge steven
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
aniController -steven
Merge pull request #7 from DevenSmith/master

Pull Your Face Steven