Working on funding a hackathon
Merge branch 'dev'