Merge branch 'master' of https://github.com/AIESeattleGameArt/Assessments_2014

adding new stuff.