guess I gotta merge?
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website
Merge branch 'master' of https://github.com/steinbergkh/ADPi-website