Broke the homepage in between classes. will fix when I get home
Merge branch 'master' of https://github.com/alicht/asuciscolti

not sure why I have to do this everytime