remove .DS_Store
remove .DS_Store from master
Merge remote-tracking branch 'Hjack/tab-fixes'

Updating local master with collaborator Hjack changes
Merge branch 'master' into rl_v_master

Merged Hjack 'tab-fixes' branch to master and rl_v_master branch
 remove .DS_Store
 changes to modal page-hoodie1
Merge branch 'paypal-stage1' of https://github.com/Hjack/awesome_hoodie_project2 into rl_v_master

Conflicts:
	.DS_Store
	hoodie_1.html
	index2.html
	js/app.js
cleaned up directory and added thankyou.erb
Fix conflicts with Rebecca
Add basic auth to app