first commit
Merge branch 'master' of http://github.com/ismaelcj/OnlineShop

Conflicts:
	config/database.yml
	config/initializers/secret_token.rb
	config/routes.rb