Remove files for uploading github
modify bugs
modify filenames
add function
Merge branch 'dev'

Conflicts:
	.gitignore