Initial commit
second
fix gitignore
fix gemfile
fix gemfile
Merge branch 'develop'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/application.rb
	config/database.yml
	config/initializers/secret_token.rb