Fixes
Merge branch 'master' of https://github.com/HasanAboShally/geekcon2013

Conflicts:
	nodeLeap/Server.js
	nodeLeap/Server2.js