Initial commit
Added .gitignore

ignoring .DS_Store
Add email files
Merge remote-tracking branch 'origin/dev'
Merge branch 'master' of https://github.com/BarrelStrength/Table-Tennis

Conflicts:
	.gitignore
	README.md
Initial upload of Framework
Merge branch 'dev'