Changes to Home

I changed things
Chnaged Some Things

dassad
Changed the Top Banner

Re-styled the top banner to be more user-friendly.
Changed top bar

blah blah changed things
Changed Conflict Errors

Handled conflict errors.
Test commit
Merge branch 'master' of https://github.com/fmarc/uBoard

Conflicts:
	src/main/webapp/home.jsp
	src/main/webapp/styles/master.css
	tomcat.8080/work/Tomcat/localhost/_/org/apache/jsp/home_jsp.class
	tomcat.8080/work/Tomcat/localhost/_/org/apache/jsp/home_jsp.java