remove old files from github
Merge branch 'alex_work' of github.com:AlexZerr/bonediva into alex_work

Conflicts:
	public/uploads/.DS_Store