re-added .gitignore and bower.json, oops
minor tweaks to work nav button appearance
merged
more changes