Initial commit
Merging / Resolving initial conflicts. Updated README