doin my thing on the collab page
Merge branch 'master' of https://github.com/nramin/gitMusic

Conflicts:
	public/assets/css/loggedin/circle.css