Merge branch 'working-branch'
Finished all coding for Project 4
Final Commit Week 4
Merge branch 'master' into working-branch

Conflicts:
	kauck_kyle_project4/app/_attachments/main.js