remember chart types
Merge branch 'master' of https://github.com/sschauss/ptt

Conflicts:
	ass01-client/app/scripts/controllers/tracks.coffee
	ass01-client/app/scripts/controllers/users.coffee