Added rest of profile characteristics to html
Merge branch 'master' of github.com:dcarrot2/agogee

Conflicts:
	templates/agogee/profile.html