show list argument
json stuff
json list stuff
Removed add button and changed delete button
merge'
template list problems
merge
Merge branch 'master' of heroku.com:simplesort
Merge branch 'master' of https://github.com/EECS-394-Purple/SimpleSort

Conflicts:
	static/main.js
Merge branch 'master' of heroku.com:simplesort