Initial Setup with Rails 4.0
Merge branch 'master' of https://github.com/josch1710/BotCenter

Conflicts:
	.gitignore