before fetch
Merge remote-tracking branch 'upstream/develop' into develop

merge
add background
Merge remote-tracking branch 'upstream/develop' into develop

merge
added responsive styling for masonry. breakpoints iphone and ipad
fix a bunch
Merge pull request #63 from palaa159/develop

fix a bunch
changed link hover color to pink, made student page masonry responsive
Merge branch 'develop-masonry-responsive' into develop
Merge pull request #64 from binaricorn/develop

Develop masonry responsive
firefox is fucking bitch
Merge pull request #65 from palaa159/develop

firefox is fucking bitch
bugfixes & easter eggs
implement 404
Merge pull request #66 from palaa159/develop

implement 404
tiny tweak
Merge branch 'develop-3D' into develop
even tinier
Merge branch 'develop-3D2' into develop
Merge pull request #67 from qkbock/develop

Develop