Adding project file.
Conflict commit.
Adding .gitignore.
Merge branch 'master' of github.com:bbsbb/restful-app

Conflicts:
	.gitignore
	LICENSE
	README.md
Progress commit.