merged
Merge branch 'master' into greg

Changed arcitection of styles files and JavaScript
Fuck