init
added gitignore
added gitignore
Merge branch 'master' of github.com:knoma/rest

Conflicts:
	.gitignore