Just checking again
Lol Testing
Merge remote-tracking branch 'Dan/master'
fix GWT SDK, add .gitignore
Testing if this works/fixed generic errors
added war folder for html and css implemention
class files should not be under version control
Merge remote-tracking branch 'Dan/master'

Conflicts:
	MartinDatabase/.classpath
	MartinDatabase/bin/edu/ycp/cs320/db/RequestHandler.class
	MartinDatabase/src/edu/ycp/cs320/servlet/PasswordHandler.java
add .gitignore
Merge remote-tracking branch 'Chad/master'

Conflicts:
	MartinDatabase/.gitignore