init
init
Merge branch 'master' of https://github.com/gengen1988/amen
Create README.md
Update .gitignore
add ignore
Merge branch 'renew' of https://github.com/gengen1988/amen into renew

Conflicts:
	.gitignore
add package
remove bower components
move bower components outside www
change structure
put all things together
Merge branch 'renew'

Conflicts:
	README.md
	server.js
	www/index.html