added lines model
cleared merge conflicts
testing
pulled from demp
working with bootstrap
responsive