Pulling master to merge new integrations
Integrating master with local and solving minor merge conflict.

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

Conflicts:
	app/controllers/index.rb
Merge branch 'aboot_partial'
Merge branch 'master' of https://github.com/nickmeehan/abooty
Pulling master to integrate recent pushes to Github
Local merge conflicts resolved

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

Conflicts:
	app/views/index.erb
	public/css/application.css
Merge branch 'master' of https://github.com/nickmeehan/abooty
Home page and profile page with routes

TODO
  *Integrate
trying to fix ma shit
Pulling master

Merge branch 'master' of https://github.com/nickmeehan/abooty into home_page
/aboots route
Fixed index.erb merge conflict
Merge pull request #15 from nickmeehan/home_page

Home page