Updating ignore
Merge branch 'master' of github.com:thejamesdempsey/brackets.css

Conflicts:
	config.codekit
	css/style.css
Removed style temp