Comments out main method in Prototype.java
Merge branch 'master' of https://github.com/cs2103aug2014-w13-2j/main
Makes Feedback class abstract