added waypoints
Merge branch 'master' of github.com:4lbertoC/OOOOh-ackOOOO
added popup
.