basic account layout
Merge branch 'master' of git@github.com:mparsha1/CS496TeamProject.git

Conflicts:
	CS496CollegePlanner/res/values/strings.xml