heroku fix
Merge branch 'master' of https://github.com/appirio-tech/lc1-challenge-app into heroku-fix
Merge branch 'master' of https://github.com/appirio-tech/lc1-challenge-app into heroku-fix
logout link + profile fix
Merge branch 'master' of https://github.com/appirio-tech/lc1-challenge-app into heroku-fix

Conflicts:
	.gitignore
Merge branch 'master' of heroku.com:lc1-challenge-app