Initial commit
merge
resolving conflict with README