Merge branch 'master' of https://github.com/wrkeizer/VP

Conflicts:
Assignment1/Main.java
SuperMain \S/