Initial commit
Remove duplicate/extraneous files
initial commit
Merge remote-tracking branch 'upstream/master'