Initial commit
first commit
Merge branch 'master' of https://github.com/lsdriscoll/Meteor-Comedy-Site
first commit
Merge branch 'master' of https://github.com/lsdriscoll/ComedySite-Meteor

Conflicts:
	README.md