pre pull commit
Merge branch 'line_version' of github.com:mrClapham/coollibs
Added untracked image fil app/images/lou.jpg
Merge conflicts
bower path changed