created add function and display
Merge pull request #1 from campope/whatever

created add function and display
Revert "comments"

This reverts commit d3e0a0997db3d3649f71030b6fbde8e2ac77b9df.

Conflicts:
	js/main.js
Merge pull request #2 from campope/whatever

Revert "comments"
Revert "initial setup"

This reverts commit 15cb0b3898cb559df70266900d397abb58bca5b8.

Conflicts:
	index.html
Merge pull request #3 from campope/whatever

Revert "initial setup"
what?
Merge branch 'master' into reverting
Revert "comments"

This reverts commit d3e0a0997db3d3649f71030b6fbde8e2ac77b9df.

Conflicts:
	js/main.js