homepage refactor
removed public/.DS_Store
Merge branch 'master' into frontend2

Conflicts:
	app/controllers/index_controller.rb
	public/.DS_Store
Merge pull request #14 from cassidyclawson/frontend2

homepage refactor