Merge branch 'master' of https://github.com/PotatoRental/WebAim

Conflicts:
	src/main/java/com/aim/controller/OutcomeController.java
Merge remote-tracking branch 'origin/master'