fixing the broken merge
Tiles now resolve by name instead of id
Merge with master
Added missing file
hiding button text when buttons not avaliable
Merge branch 'master' of github.com:heidi-ann/zygote
Fixed rare bug caused by float-double casting
Merge branch 'master' of https://github.com/heidi-ann/zygote

Conflicts:
	src/notification_bar.hpp
	src/sprite.hpp
refactoring notification_bar
Merge branch 'master' of github.com:heidi-ann/zygote

Conflicts:
	src/main.cpp
	src/notification_bar.hpp
moving to ids and adding destructor
moving from shared pointers to ids and adding destructor
sprite deconstruting there own focus overlay
adding presence check for remove obj
fixing indentation
moving inventory from shared_ptr to id's
Merging in master