first commit
Merge https://github.com/admazzola/makerswaveapp