Added GCal-file support
Merge branch 'master' of https://github.com/cs2103aug2014-t16-1j/main