initial checkin
Merge branch 'master' of https://github.com/fold88/ex

Conflicts:
	.gitignore