pulling yan's changes
resolved merge conflicts from pulling yan's changes
half way through merge
tomcat is annoying me moving to local machine