Merge pull request #36 from jlambert121/master

lint fixes
normalize common files
Merge pull request #35 from jlambert121/modulesync

normalize common files