Test
Merged bogus readme conflicts
Added module skeleton boilerplate