My working copy
Merge branch 'master' of https://github.com/leovander/CorrelaterFrontEnd

Conflicts:
	correlater/www/js/main.js