added slides
bugfix
started adding file upload
added buggy implementation of assetmanager
newest
deletions
deleted uploaded pics
kein plan
fixed martins stuff
uploader route bugfix
fixed navbar email bug
fixed your bad destroy link
Merge branch 'joh' of github.com:johdirr/SlideCloud into joh
added dropzone to upload modal
added .DS_Store to gitignore
added upload folder to gitignore
fixed your terrible errors
merged your hacky stuff
Merge branch 'joh' of github.com:johdirr/SlideCloud into joh

Conflicts:
	app/templates/shared/modal/_upload.mustache
added backbone gem
Merge branch 'joh' of github.com:johdirr/SlideCloud into joh