Initial files added, build broken
temp commit, login mechanism
Merge branch 'master' of https://github.com/Empters/HealthPriority
Fixing assets
Fixing assets bootstrap import
very small change
Styles updated, header and footer placed in application.html
Styles updated
Styles updated
Mock up images shown. FB icon in the top nav added
Front_end branch changes
added bootstrap, jquery, images are ok on home page, login is in progress
Merge branch 'front_end' of https://github.com/Empters/HealthPriority into front_end

Conflicts:
	app/assets/stylesheets/styles.css.erb
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
fix conflicts
set confirmable to the user, now it sends mails
Merge pull request #2 from Empters/front_end

Front end
Merge branch 'master' of https://github.com/Empters/HealthPriority

Conflicts:
	db/schema.rb
Active admine product changes
Move main nav tabs in layout
add login modal to layout