First Upload
Merge branch 'master' of https://github.com/cwgieselman/erb

Conflicts:
	.gitignore