changing CSS
Merge branch 'master' of https://github.com/trevynmeyer/fishermen

Conflicts:
	resources/css/style.css