updating some random file

github made me do it
massaged json data to be displayed
fixing merge conflicts on .class files
Merge branch 'master' of https://github.com/vmathur/mchacks