Git is being a little strange, recommiting
Merge branch 'master' of http://github.com/audunthecyborg/adtjs