gitignore
began area style at 0 instead of 1
Merge branch 'css' into up-to-date
gitignore
update bower version