Fix gitignore and updated detailed
Merge branch 'master' of https://github.com/lizneu/pottytime

Conflicts:
	app.js
Merge branch 'master' of https://github.com/lizneu/pottytime