Generate the Rails 4 application
Merge branch 'master' of github.com:dpw67/ticketee4

Conflicts:
	.gitignore
Initial commit