two factor test
Merge remote-tracking branch 'origin/master'

Conflicts:
	bower.json
	public/javascripts/controllers.js
	views/index.jade
	views/layout.jade