FrontEnd and Bottle added
Merge branch 'master' of https://github.com/vincentleest/CSC326