layout update, not the best
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/cse/usf/edu/healthicalissues/R.java
Merge branch 'master' of https://github.com/petert1123/COP4656Project