Just fixed some small warnings. Now that we all have the project working I am going to fill out the .gitignore tomorrow so that not so many unnecessary files are committed each time.
Changed around some packaging in an attempt to make the project more modular. Also added to the .gitignore so that only necessary files are tracked.
Now the the .gitignore file will be doing its job, you must    Run->Maven Clean    AND  Run->Maven Install     after every pull. Failure to do so will result in your project not working.
Added a photo of our schema model and the commands used to create it. Located in ourResources.
Adding new Java entities from database tables.
Looking into different queries for User. Fixed some errors with our restController
Merge branch 'Stage1' of https://github.com/acdana/ComS309Project into Stage1

Conflicts:
	src/main/java/com/entities/User.java
no message
Merge branch 'Stage1' of https://github.com/acdana/ComS309Project into Stage1

Conflicts:
	src/main/java/META-INF/persistence.xml
	target/m2e-wtp/web-resources/META-INF/maven/com.cs309.team11/ComS309Project/pom.properties
Took care of some merge issues.
I've altered our RestController so that it has the ability to create new users via 309/T11/createNewUser/{username}/{password}/{email}. I think that I will end up moving this to a separate method.
Added a deleteUser rest call.
Added in functionality for deleteUser. Should work with the query that Kevin made.
Merge branch 'Stage1' of https://github.com/acdana/ComS309Project into Stage1

Conflicts:
	target/ComS309Project/WEB-INF/web.xml
Fixed some small errors for the deleteUser call. Works well now.
Added queries to penalize a user, get a list of penalized users, and get the penalty count of a user to the User entity.
Changed mapAllUsernames to just mapUsernames and gave it a string parameter so it can be used for any query that returns a list of usernames (or any string in general).
Updated the AbstractDataController to accommodate changes necessary for DataController.
Changed how executeUpdate() was handled in deleteUser and penalizeUser methods in DataController.
Added penalizeUser, getPenalizedUsers, and getPenaltyCount methods to the DataController and RestController.
Added in a basic angularJS call that will create a given user. This needs to be replaced so that it happens on a button click with dynamic values.
Merge branch 'Stage1' of https://github.com/acdana/ComS309Project into Stage1
Our front-end will consume JSON so that is what we will return now.
Merge branch 'Stage1' of https://github.com/acdana/ComS309Project into baf3939Branch

Conflicts:
	.classpath
	.gitignore
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	target/m2e-wtp/web-resources/META-INF/maven/com.cs309.team11/ComS309Project/pom.properties