On branch master
 Changes to be committed:
	modified:   bin/Debug/event
	modified:   event.hpp
	new file:   event/event.hpp
	modified:   event/function.hpp
	new file:   event/system.hpp
	modified:   main.cpp

 On branch master
 Changes to be committed:
	modified:   bin/Debug/event
	modified:   event.hpp
	new file:   event/event.hpp
	modified:   event/function.hpp
	new file:   event/system.hpp
	modified:   main.cpp

 Changes not staged for commit:
	deleted:    event/system.hpp
Merge branch 'master' of https://github.com/minispiri/event

Conflicts:
	bin/Debug/event
	event/event.hpp
 On branch master
 Changes to be committed:
	new file:   event/system.hpp