[fix] fixed gitignore conflicts

Conflicts:
	.gitignore
	css/ie.css
	css/main.css
Merge branch 'master' of github.com:in8/dummy