Merge branch 'master' of https://github.com/greenstreetsinitiative/checkin
Merge branch 'master' into dev
added chosen plugin
fix my dumb git mistake and merge these files back in