CIT-261-Crap-App This project is awesome! For the sake of ease we should stick to the master branch, and simply merge the files on top of eachother.