adding makerstrap
Merge pull request #12 from gvn/strapify

adding makerstrap
Merge branch 'master' of https://github.com/mozilla/webmaker-events-2 into markdown

Conflicts:
	bower.json