First commit
Merge branch 'master' of https://github.com/JVST/jvst-hack-day-team-3

* 'master' of https://github.com/JVST/jvst-hack-day-team-3:
  Initial commit