Added gem file and lock
hmmm
Merge branch 'master' of https://github.com/eheiser/nailedit

Conflicts:
	css/screen.css