session progress
merging conflicts
added files
Merge branch 'master' of github.com:kil432/Farmar-Rails

Conflicts:
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
	app/views/sessions/new.html.erb
	config/routes.rb