i think its in the middle now???
i dont think i did this.....but ...
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/pages/index.html.erb
Merge branch 'master' of https://github.com/LexLadiesCode/KristenAndToddGetMarried

Conflicts:
	app/assets/stylesheets/gifts.css.scss