Integrating frontend and backend
Merge branch 'master' of https://github.com/phuston/iCalOlin