first commit
Merge branch 'master' of github.com:silenceisgolden/capstone-project

Conflicts:
	README.md