Initial commit (already done task 1 and 2)
Merge branch 'master' of github.com:wwu-inmo-2014/VF2