mod TestABC.java
Update TestBeanOne.java
Template changes
Merge remote-tracking branch 'Main/master'

Conflicts:
	WebContent/resources/css/common-style.css
	src/com/myboard/test/TestABC.java
	src/com/myboard/test/TestBeanOne.java
Change content width
Create README.md
Merge remote-tracking branch 'Main/master'

Conflicts:
	WebContent/resources/css/common-style.css
	WebContent/template/common/commonContent.xhtml
	WebContent/template/common/commonFooter.xhtml
	WebContent/template/common/commonHeader.xhtml
	WebContent/template/common/commonLayout.xhtml
fix
Merge branch 'master' of https://github.com/jlorett/myboard.git
Merge remote-tracking branch 'Main/master'

Conflicts:
	WebContent/template/common/commonContent.xhtml
	WebContent/template/common/commonFooter.xhtml
	WebContent/template/common/commonHeader.xhtml
	WebContent/template/common/commonLayout.xhtml
Merge remote-tracking branch 'Main/master'
update
Test grabbing database data again.
Database read all now properly retrieving data.
Added student page.
Update 5/7/13
Added comments
Merge remote-tracking branch 'Main/master'

Conflicts:
	.classpath
	src/com/myboard/business/UserSession.java
	src/com/myboard/dao/CourseMaterialDao.java
Merge pull request #11 from jlorett/master

Josh Pull Request 2