Delete Procfile
Rename index.html to admin.html
added DS_Store to gitignore
abc
rm jnk
fixed brace
fixed bugs
resolved conflict
moved admin to public folder
fixed app.js
fixed conflicts