code+pics
Merge branch 'master' of https://github.com/nprajilesh/AssetTracking

Conflicts:
	Floor_maps/base.png
	Floor_maps/bottom.png
	Floor_maps/ff.png
	Floor_maps/gf.png
	Floor_maps/index.html
	Floor_maps/middle.png
	Floor_maps/top.png