Merge branch 'master' of https://github.com/cvetter34/project3

Conflicts:
	public/images/armor.jpeg
	public/images/bow.jpg
	public/images/christian.jpg
	public/images/hammer.jpg
	public/images/julie.jpg
	public/images/marco.jpg
	public/images/shield.jpg
Merge branch 'master' of https://github.com/cvetter34/project3
Merge pull request #62 from JulesWiz/master

CSS and image dimension