adding gallery transitions
Merge branch 'master' of https://github.com/scotopic/bnr_nerd_battle_3_12_14

Conflicts:
	BigNerdsPaint.xcodeproj/project.pbxproj