Signed-off-by: Elie A <elie.pennstate@gmail.com>
Merge branch 'master' of
https://github.com/epiphonewizard/sweng505Team3.git

Conflicts:
	StudentLotto/src/main/java/com/studentLotto/lottery/transaction/TransactionController.java
	StudentLotto/src/main/webapp/WEB-INF/views/fragments/header.html