first commit
First commit

Merge branch 'master' of https://github.com/enkomio/SCAEP

Conflicts:
	README.md