working with profile
Merge branch 'master' of https://github.com/Joelgullander/Kodapor

Conflicts:
	js/controllers/profileCtrl.js