got rid of faulty main, fixed a few small errors
Merge branch 'master' of https://github.com/kwangaroo/APCS2014