removed extraneous code
removed extra files
styling
Merge branch 'master' into develop