Final commit week four
Merge branch 'master' into working-branch

Conflicts:
	kauck_kyle_project4/app/_attachments/main.js
Merge branch 'working-branch'