Merge remote-tracking branch 'Drew/master'
here
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
Merge remote-tracking branch 'Josh/master'
Merge remote-tracking branch 'Drew/master'
pulled from Drew
Having the ability to login
final work done as of 11:53 AM on 4/19/2013
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs