Removed unnecessary files
Bug fixes and styling
Merge remote-tracking branch 'origin/master'