tester med vers1
merging..
Merge branch 'master' of https://github.com/lha047/CXJulekort2014
tester
Merge branch 'master' of https://github.com/lha047/CXJulekort2014

Conflicts:
	app/index.html
added audio test, changes to scroll flow
Merge branch 'master' of https://github.com/lha047/CXJulekort2014