merged webmachine with our engine
had deleted a makefile by accident
updated makefile and start.sh
updated headers
Merge branch 'develop' of git://github.com/projectcs13/sensor-cloud into sprint2.webmachine-engine-merged

Conflicts:
	engine/Makefile
Merge pull request #27 from projectcs13/sprint2.webmachine-engine-merged

Sprint2.webmachine engine merged
There was some weird problem with Georges' pull request, so I closed that one to see if it resolved the error, which it didn't. And now I managed to solve the problem and merged it directly.