New stuff from github
Merge pull request #8 from juliemcglaughlin/master

Style
Merge branch 'master' into juliemcglaughlin-master

Conflicts:
	SeniorProjectjQueryMobile.html