Pulling master to integrate fixes before presentation
Final staging before presentation

TODO
  *DEPLOY!

Merge branch 'master' of https://github.com/nickmeehan/abooty into home_page

Conflicts:
	app/controllers/sessions.rb
	app/views/welcome.erb
Last pull before push
Merge branch 'master' of https://github.com/nickmeehan/abooty into home_page
Merge pull request #17 from nickmeehan/home_page

Home page