fixed gemfile
api done
stupid changes
Merge branch 'development' of github-jam:/dealshook/rubyProject into api

Conflicts:
	app/views/welcome/index.html.erb
cities states countries done
Merge branch 'development' of github-jam:/dealshook/rubyProject into api
index page