added bower
added some styling
Merge remote-tracking branch 'origin/master'