Added makefile
Merge branch 'dev' of https://github.com/rcos/Observatory into dev

What