merge already
Merge branch 'master' of https://github.com/emnetag/info340Final

Conflicts:
	.idea/workspace.xml
	web/templates/area.html