added express app and socket support
Merge branch 'master' of https://github.com/berkley/arduino into thomas
added circles
resolved conflict