Added login and join links
Login and signup
Merge branch 'master' of https://github.com/johnwalley/risk-jargon-generator

Conflicts:
	app/js/controllers.js
History changes
Merge branch 'master' of https://github.com/johnwalley/risk-jargon-generator

Conflicts:
	app/js/services.js