Switch to localhost
Merge remote-tracking branch 'upstream/master'
Move stuff
Merge pull request #1 from Rumel/ProjectCleanup

Project cleanup