add edit delete

type of selection button
Merge branch 'master' of https://github.com/vivanov1410/comp1920

Conflicts:
	.DS_Store
	app/.DS_Store
	app/routes.php
	app/views/home.blade.php
	public/.DS_Store
	public/css/style.css
	public/js/jquery-1.10.1.js
	public/js/script.js
	public/js/underscore.js