added speedtest back
Merge branch 'master' of http://github.com/Mekapaedia/mdb-testing
Merge branch 'master' into ryan
Added some stuff, makefile is better