EVERYTHING final touches for todays work
Merge branch 'master' of github.com:martflu/amanaman