Initial commit
Initial commit
Merge branch 'master' into work

Conflicts:
	app/controllers/home_controller.rb
commit
commit
commit
Merge branch 'master' into work

Conflicts:
	app/controllers/home_controller.rb
commit
commit
Merge branch 'master' into work

Conflicts:
	app/controllers/home_controller.rb
commit master
commit work
Merge branch 'master' into work

Conflicts:
	app/controllers/home_controller.rb