added markers
Merge branch 'master' of https://github.com/2014DaemonDash/phish-and-microchips