nickname
Merge branch 'master' of https://github.com/gvn/webmaker-profile

Conflicts:
	_fe/js/templates.js
adding avatar
merging
bower.json
Merge pull request #4 from gvn/wip

Wip