removed php yuck, added main.js file
Merge
merge
remove dir
Merge remote-tracking branch 'origin/nick' into uly
fast crap styles
Merge with lates nick branch - 10:27pm