git commit -m "added bootstrap and applied layout to the page"
git commit -m""
git commit -m
git commit -m""

it commit -m 'Type your commit message here'
git commit -m "added bootstrap"
git commit --amend "added bootstap"
git commit --amend -m "added bootsrap"
git push origin master
i git commit -m "added bootstrap"
q
:q.
:q
git push origin master
":q"
i
"added bootstrap and applied layout"
Merge https://github.com/ossianmacdonald/treehouse

Conflicts:
	.gitignore
	app/assets/javascripts/statuses.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/statuses.css.scss
	app/models/status.rb
	app/views/layouts/application.html.erb
	app/views/statuses/_form.html.erb
	app/views/statuses/index.html.erb
	app/views/statuses/show.html.erb
	config/initializers/secret_token.rb
	db/schema.rb
	test/fixtures/statuses.yml
	test/functional/statuses_controller_test.rb