terms
Merge branch 'master' of https://github.com/Floppy/seedpod

Conflicts:
	app/views/pages/terms.html.erb