home page stuff
merge conflicts
Merge branch 'master' of https://github.com/elongpre/The-Seventh-Group