setting up the main project
Merge branch 'master' of https://github.com/OneWeekNotice/Capstone
setting up the main project