micas init
Merge branch 'master' of https://github.com/micage/eve

Conflicts:
	app/views/gallery_images/index.html.erb
created Employee class