Got the most updated version
updated and merged with drew
Updated ALOT OF FILES
Merge remote-tracking branch 'josh/master'
Making more changes
Merge remote-tracking branch 'Drew/master'
CHanged some font colors
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'
working on contact info view
Merge remote-tracking branch 'Drew/master'
Merge remote-tracking branch 'Drew/master'
Commit
Merge remote-tracking branch 'Drew/master'
pulled from Drew
Merge remote-tracking branch 'josh/master'
Having the ability to login
final work done as of 11:53 AM on 4/19/2013
edited and added contact info things