first!
Merge branch 'master' of github.com:eahanson/rubymotion-example

Conflicts:
	.gitignore