yamp reborn
Merge branch 'master' of github.com:2ATeam/YAMP
old yamp goes to hell