Fixed annoying merge dinasour eating my code
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into feature/quicklist