Commit before pull
Merge branch 'master' of https://github.com/ericknicolas/lds

Conflicts:
	.idea/workspace.xml
	public/index.html
add up and down