Initial commit,  swiping somewhat working
Merge branch 'master' of https://github.com/jjing/121FinalProjectSpr14

Conflicts:
	.gitignore