fuck sourcetree
FUCK SOURCETREE!!!

Merge branch 'master' of https://github.com/flyingfeet/fitduell

Conflicts:
	www/js/base/routing.js
	www/js/controllers/challenge-controller.js
	www/js/controllers/timeline-controller.js
	www/js/services/auth-service.js
	www/js/services/challenges-service.js
	www/templates/timeline.html