Added cpu and memory tuning to map
Merge pull request #6 from retr0h/retr0h/added-tuning

Added cpu and memory tuning to map
Merge branch 'master' into stable/havana