Added files, changed stuff
Merge branch 'master' of https://github.com/gmenih341/gm_webpage