Dried stuff
Implemented basic custom markers
Merge branch 'dev' of https://github.com/MitchelCabuloy/StormShed into dev