optionchain
Merge branch 'master' of https://github.com/wjshea1/webdev

Conflicts:
	app/js/app.js
	app/js/routes/router.js