# MAJOR UPDATE

+ Added a nearly-finished Map Editor GUI :D
+ Added some icons

Notes:
Needs a SFML renderer and actual editor logic
Merge branch 'master' of github.com:SprytnyZbys/Eynal

Conflicts:
	Eynal.cbp
	Eynal.depend
	Eynal.layout
	MapEditor/MapEditor.cpp