jsp and controller

changed profile.jsp, adminControls.jsp, and MasterController.java
Merge branch 'master' of https://github.com/dylanab/CS4300FinalProject