bootstrapping
merge resolved
Merge pull request #10 from StevenHarlow/alejandro

basic bootstrapping