bower jquery
bower, gitignore
Merge branch 'master' of https://github.com/Raslucas/Carla

Conflicts:
	custom.css
config.codekit