Remove files for uploading github
Merge branch 'dev'

Conflicts:
	.gitignore
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
enable cmake
merge master
Merge branch 'dev' of https://github.com/MoriokaReimen/GPS into dev

Conflicts:
	Makefile
	src/gps.py
ready for merge
remove Makefile
Merge branch 'master' into dev

Conflicts:
	Makefile