some fix
Merge branch 'master' of github.com:chioshinu/first_rails_app

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/workspace.xml
	app/views/connect/all.html.haml