Added seeding functionality
Merge pull request #15 from nickmeehan/home_page

Home page
Merge pull request #14 from nickmeehan/seeding_data

Added seeding functionality
HOTFIX FOR ERRORS IN SHIT
Pulling master to integrate fixes before presentation
removed faker from gemfile to enable app to deploy to heroku
updated gemfile for heroku
removed faker require from environment.rb for heroku
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
Merge pull request #16 from nickmeehan/deployed_to_heroku

Deployed to heroku
Last pull before push
Merge branch 'master' of https://github.com/nickmeehan/abooty into home_page