Add this shit
Merge branch 'master' of github.com:mdelrosa/ScissorBros

Conflicts:
	node_modules/ar-drone/node_modules/buffy/package.json
	node_modules/ar-drone/node_modules/simple-debug/package.json
	node_modules/ar-drone/package.json
	node_modules/ardrone-autonomy/node_modules/async/package.json
	node_modules/ardrone-autonomy/node_modules/sylvester/package.json
	node_modules/ardrone-autonomy/package.json