x
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	XFlixel.suo
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 99f148722f216410ab5d4e51ecb033a317dd0fb4.