6 Commits

Author SHA1 Message Date
Jeremy
23e64375e8 Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.md
2014-08-01 23:43:18 -04:00
mrSkortch
a51deb7854 Edit a word 2014-08-01 21:21:57 -06:00
Jeremy
4a97ea974e Added contribution guide to README
This will set expectations for contributors and remind you of the
process as well.
2014-08-01 22:56:05 -04:00
mrSkortch
989e4c90ff Update README.md 2014-08-01 18:32:20 -06:00
mrSkortch
66316a8a85 Fixed a thing cause github is new to me 2014-08-01 18:25:32 -06:00
mrSkortch
f968de7683 Create README.md 2014-08-01 17:48:34 -06:00