test on readme
Revert "test on readme"

This reverts commit 5acb6239ef8276f369bf7fca5cf3ae762081261b.
add template css
Merge branch 'Corey' into Doris
New stuff
Merge commit '468441eaa1b7f1261c11fb626075919fbea66fd8' into Doris
Tons of changes! Read readme.txt !!!
Make the user page worked as the load resume page, changed icons, added styles
stuff
Merge remote-tracking branch 'origin/Doris'

Conflicts:
	NewResume.php
Fixed conflicts
some bug fix
Latest edits
add index page
bug fixes (final patch hopefully)
Merge remote-tracking branch 'origin/Doris'
Merge remote-tracking branch 'origin/Corey' into Rob