gitignore changes
Merge branch 'origin' of github.com:andresbrun/SquaresFlipNavigation into versions/alpha

Conflicts:
	.DS_Store