Fixed a few things
Merge branch 'master' of github:aburkhalter512/css422