First Commit
resolved conflicts
lMerge branch 'master' of khalihan.github.com:khalihan/play-slick-cruds

Conflicts:
	.gitignore