INFO 340 10/15/14 class work
Merge branch 'master' of https://github.com/morpheus58/javascript-forms

Conflicts:
	js/app.js