friends
Merge branch 'master' into post
currentchallenge
challenge
Merge branch 'post'

Conflicts:
	public/js/script.js
	public/js/templates.html