container, inicio e adicionado function class
Merge branch 'master' of github.com:kummel/Kheiron-Alpha

Conflicts:
	Kheiron/MainStoryboard.storyboard