Should fix issue #13
Adding changes to changelog
Should have deleted it instead of commenting (issue #13)
Fixes issue #12
Adding note about issue #12
Fixing merge with master
Beautify domains and upstream