final commit
Merge branch 'master' of https://github.com/jml88/tsi206

Conflicts:
	jatrick/web_jatrik/WebContent/resources/stylesheets/layout.css