Changed java 7 construct to be compatible with java 6
Merge branch 'master' of https://github.com/LeoLogeart/cs6675.git
Fix indices