first commit
play eclipse add
Merge branch 'master' of https://github.com/ehowlsla/ThankYouApi

Conflicts:
	README.md
	app/controllers/Application.java
	conf/application.conf
	conf/routes
	project/Build.scala
Merge branch 'master' of https://github.com/ehowlsla/ThankYouApi

Conflicts:
	conf/routes
Commit