Malin Facebook
Merge branch 'master' of github.com:skuggla/TreIRad

Conflicts:
	Resources/start.js