testing
Merge branch 'master' of git@github.com:enzo41/School-Registration-Web-App.git
Changed to Java 7 syntax.