contacts
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/static_pages/contact.html.erb

Merge remote-tracking branch
'origin/master'

Conflicts:
	app/views/static_pages/contact.html.erb
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 346a9f7850371a1d74832354ddcb4948254e2bb4.
wtf why don't tables work

asdfasdf
asdf

asdf
about background
Revert "contacts"

This reverts commit 6a5bc8acf4204f647578c278b6e921e8eef95ee2.
Revert "Revert "contacts""

This reverts commit 623e085a1124167daa0e78dcb33f2690bc1b02b3.
asdfgh