achievements & team page
Merge branches 'master' and 'master' of https://github.com/ideapuff/proving

Conflicts:
	public/css/main.css
	public/sass/main.sass