getting all of erics files , images still not working
updating hidden files
merge branch 'master' of https://github.com/ebylund/jail
added the style and image logo to the nav, also updated the key values for the info
Merge branch 'master' of https://github.com/ebylund/jail

Conflicts:
	app/views/jails/main.html.erb