Merge branch 'master' into sean-changes
clean up
Merge branch 'master' into sean-changes

Conflicts:
	client/app/layout.html
Instagram js
Updates
Adding currentUser
Merge branch 'sean-changes'