Fix profile pictures and ignore the avatar folder
Merge branch 'master' of github.com:vaughanj10/new_synergy
Merge branch 'master' of heroku.com:newsynergy

Conflicts:
	.gitignore