Inital Commit
inital commit from tom
Added model class for Photo and User
Added hashtag model class, needs implemented
minor changes to other model classes
GIT HUB SUCKS
Project hopefully works
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git
test commit
test commit
added new project for web includes a login.jsp and uses Tomcat v8.0
add a link between the login page and create account page
added textboxes in createAccount
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git

Conflicts:
	CS481_Web/.classpath
	CS481_Web/.project
	CS481_Web/.settings/.jsdtscope
	CS481_Web/.settings/org.eclipse.jdt.core.prefs
	CS481_Web/.settings/org.eclipse.wst.common.component
	CS481_Web/.settings/org.eclipse.wst.common.project.facet.core.xml
	CS481_Web/WebContent/META-INF/MANIFEST.MF
	CS481_Web/WebContent/WEB-INF/login.jsp
	CS481_Web/WebContent/WEB-INF/web.xml
	CS481_Web/WebContent/createAccount.jsp
	CS481_Web/WebContent/login.jsp