I want to pull.
Merge branch 'master' of github.com:dupontmanual/dm-forms-example

Conflicts:
	app/controllers/App.scala
	project/Build.scala