changes
links
changes
changes
Merge branch 'master' of https://github.com/KevinMarete/NASCOP

Conflicts:
	log.txt