adding bootstrap
adding bootstrap
adding login page, show page css
Merge branch 'master' of github.com:rnparks/tojamers into mikes_commit
merge
Conflicts:
	app/views/stories/company_story.html.erb
Merge branch 'master' of github.com:rnparks/tojamers into mikes_commit
merge
adding new css
merge conflicts resolved with larkin
master looks good