[del] add Gemfile.lock to gitignore
[del] removed generated js and css files from repository
[fix] fixed gitignore conflicts

Conflicts:
	.gitignore
	css/ie.css
	css/main.css