Added teabag for testing
Merge branch 'develop' of github.com:Derkje-J/programming-life into develop

Conflicts:
	app/assets/javascripts/application.js
Fixed failing graph tests