kinda linked together shit
Merge branch 'master' of https://github.com/paranoiaplus/Breaking-Barriers-Hackathon