Generated the Rails 3 application
Merge branch 'master' of github.com:blurredbits/ticketee

Conflicts:
	.gitignore