updated fly
allowing any version of node
allowing any version of express
updated node, still builds w/o error
Merge pull request #55 from mLuby/dev

Improved fly
Merge pull request #54 from kokobeens/website

Add loading bar for dronemodel
Merge pull request #57 from kokobeens/website

Added new propeller models
Added style changes for website
Merge branch 'dev' of https://github.com/ConnectedMachines/TesselDrone

Conflicts:
	client/vizualizer.html
Added additional styling and team bios
Merge pull request #58 from gabdallah222/master

Added style changes for website
![](http://www.google.com/url?sa=i&source=images&cd=&cad=rja&uact=8&ved=0CAgQjRw&url=http%3A%2F%2Fthemightygosh.deviantart.com%2Fart%2FChopper-star-eyes-162139073&ei=X448VOKIAsupogSTy4LQCQ&psig=AFQjCNHcH8MOFFAzkL20QER3xvSgJ5ad9A&ust=1413341151140112)
finalized most recent style changes
Merge pull request #59 from gabdallah222/master

finalized most recent style changes
Merge branch 'dev' of https://github.com/ConnectedMachines/TesselDrone into website

Conflicts:
	client/d3_visualizer/d3Directives/droneStatus.js