First real commit yo
Merge branch 'master' of https://github.com/laumer15/NMIX-NewMedia-Redesign