work in progress
Merge branch 'master' of github.com:h0shim0/getwill

Conflicts:
	Gemfile.lock
	app/views/posts/index.html.erb