create project
gitignore file
Merge branch 'master' of https://github.com/fancyblock/Demo20140926

Conflicts:
	.gitignore