Fixes nav bar spacing.
implements styling
Merge branch 'master' into layout-styling
Integrate grunt to use rewrite rules, working properly now.
Integrate grunt to use rewrite rules.
Awesome working fb integration, needs partial.
Merge branch 'master' of https://github.com/kvindasAB/kivame-ui
Integrate grunt to use rewrite rules.
Merge branch 'master' into layout-styling

Conflicts:
	app/css/app.css
	app/js/home-controller.js
facebook?
Magic facebook wonderfulness.
Merge branch 'master' into layout-styling

Conflicts:
	app/index.html
Merge pull request #5 from kvindasAB/layout-styling

Layout styling
appends a box upon clicking the carousel
updated with master
fixed merge conflict