added lines model
cleared merge conflicts
testing
pulled from demp
working with bootstrap
css changes
created the circles for the trains
pulling from sammy
cleaning up html and working with bootstrap
fix some issues with bootstrap
testing for git pull
adjusted the home.html.erb file
home page set up
updated buttons, headers and images
pulling UI from demo branch
updated seed files and fixed migrations
sign in fix
fixing the edit page, in progress
Merge branch 'demo' of github.com:Sammykhaleel/mta into demo
working through some merge conflicts with Blake