account settings
Merge branch 'master' of github.com:deanhiller/playground

Conflicts:
	app/views/main.html