Generate Rails 4 application
Merge branch 'master' of github.com:meyerbw/ticketee

Conflicts:
	.gitignore