First commit of working tree
Merge with working

* ../itc280.psophis.com/old_itc280:
  First commit of working tree

Conflicts:
	admin/admin_add.php
	admin/admin_dashboard.php
	admin/admin_edit.php
	admin/admin_error_list.php
	admin/admin_error_view.php
	admin/admin_info.php
	admin/admin_list_log.php
	admin/admin_login.php
	admin/admin_logout.php
	admin/admin_reset.php
	admin/admin_validate.php
	admin/index.php
	admin/nmEdit.php
	adminer.php
	articles/12_01_09_assignment1.md
	articles/12_01_11_assignment2.md
	articles/12_01_16_CMS.md
	articles/12_01_16_CSS.md
	articles/12_01_16_Etiquette.md
	articles/12_01_16_HTML.md
	articles/12_01_16_JS.md
	articles/12_01_16_PHP.md
	articles/12_01_16_UI.md
	articles/12_01_16_tools.md
	articles/12_01_16_type.md
	articles/12_01_17_post_class.md
	articles/12_01_18_What this site is built from.md
	articles/12_01_19_Markdown.md
	articles/12_01_24_assignment3.md
	articles/12_01_28_assignment4.md
	articles/12_02_06_assignment5.md
	articles/12_02_06_extra_credit1.md
	articles/12_02_27_assignment6.md
	articles/12_02_28_assignment7.md
	articles/12_03_01_assignment8.md
	articles/12_03_12_assignment9.md
	articles/12_03_20_assignment10.md
	assignmnets/A3/index.php
	assignmnets/A4/contact.php
	assignmnets/A4/contact_multiple.php
	assignmnets/A4/include/recaptchalib.php
	assignmnets/A4/include/util.js
	assignmnets/A4/index.php
	assignmnets/A4/nmCAPTCHAEmail08052010.pdf
	assignmnets/A4/no_captcha.php
	assignmnets/A4/reCHAPCHA.md
	assignmnets/A4_EC/contact_multiple.php
	assignmnets/A4_EC/include/recaptchalib.php
	assignmnets/A4_EC/include/util.js
	assignmnets/A4_EC/index.php
	assignmnets/A6/index.php
	config.php
	contact/index.php
	ie_sucks.html
	includes/Post.php
	includes/admin_only_inc.php
	includes/classes/Css.php
	includes/classes/Favicon.php
	includes/classes/JS.php
	includes/classes/Link.php
	includes/classes/Meta.php
	includes/classes/Script.php
	includes/classes/Style.php
	includes/common_inc.php
	includes/config_inc.php
	includes/conn_inc.php
	includes/log/error_log_03-15-2012.txt
	includes/theme.php
	index.php
	run.php
	template.php
	thankyou/index.php
	themes/linen/comment.php
	themes/linen/css/style.css
	themes/linen/footer.php
	themes/linen/head.php
	themes/linen/images/linen.png
	themes/linen/js/highlight.pack.js
	themes/linen/js/util.js
	themes/linen/js/validate.js
	themes/linen/scss/code.scss
	themes/linen/scss/comment.scss
	themes/linen/scss/nav.scss
	themes/linen/scss/style.scss
	themes/natural-essence/comment.php
	themes/natural-essence/css/style.css
	themes/natural-essence/fonts/helveticaneue.eot
	themes/natural-essence/fonts/helveticaneue.svg
	themes/natural-essence/fonts/helveticaneue.ttf
	themes/natural-essence/fonts/helveticaneue.woff
	themes/natural-essence/fonts/monaco.eot
	themes/natural-essence/fonts/monaco.svg
	themes/natural-essence/fonts/monaco.ttf
	themes/natural-essence/fonts/monaco.woff
	themes/natural-essence/footer.php
	themes/natural-essence/head.php
	themes/natural-essence/js/highlight.pack.js
	themes/natural-essence/js/util.js
	themes/natural-essence/js/validate.js
	themes/noisy-grey/comment.php
	themes/noisy-grey/css/style.css
	themes/noisy-grey/fonts/helveticaneue.eot
	themes/noisy-grey/fonts/helveticaneue.svg
	themes/noisy-grey/fonts/helveticaneue.ttf
	themes/noisy-grey/fonts/helveticaneue.woff
	themes/noisy-grey/fonts/leaguegothic.eot
	themes/noisy-grey/fonts/leaguegothic.svg
	themes/noisy-grey/fonts/leaguegothic.ttf
	themes/noisy-grey/fonts/leaguegothic.woff
	themes/noisy-grey/fonts/monaco.eot
	themes/noisy-grey/fonts/monaco.svg
	themes/noisy-grey/fonts/monaco.ttf
	themes/noisy-grey/fonts/monaco.woff
	themes/noisy-grey/footer.php
	themes/noisy-grey/head.php
	themes/noisy-grey/images/texture.png
	themes/noisy-grey/js/highlight.pack.js
	themes/noisy-grey/js/util.js
	themes/noisy-grey/js/validate.js
	themes/side-nav/comment.php
	themes/side-nav/css/style.css
	themes/side-nav/fonts/helveticaneue.eot
	themes/side-nav/fonts/helveticaneue.svg
	themes/side-nav/fonts/helveticaneue.ttf
	themes/side-nav/fonts/helveticaneue.woff
	themes/side-nav/fonts/leaguegothic.eot
	themes/side-nav/fonts/leaguegothic.svg
	themes/side-nav/fonts/leaguegothic.ttf
	themes/side-nav/fonts/leaguegothic.woff
	themes/side-nav/fonts/monaco.eot
	themes/side-nav/fonts/monaco.svg
	themes/side-nav/fonts/monaco.ttf
	themes/side-nav/fonts/monaco.woff
	themes/side-nav/footer.php
	themes/side-nav/head.php
	themes/side-nav/images/texture.png
	themes/side-nav/js/highlight.pack.js
	themes/side-nav/js/util.js
	themes/side-nav/js/validate.js
	timesheet/index.php