Merge branch 'master' of https://github.com/jaredgeizer/Git_Resto

Conflicts:
	resto.css
i fixed it

yaaaaaay