recovered data
Merge branch 'master' of https://github.com/type1wd/PWA2

Conflicts:
	Wk3/FollowAlong/templates/languages.html
	Wk3/Goal4.pdf
	Wk3/Goal5.pdf
	Wk4/FINAL/css/main.css
	Wk4/FINAL/dashboard.php
	Wk4/FINAL/database2.sql
	Wk4/FINAL/error_log
	Wk4/FINAL/humans.txt
	Wk4/FINAL/images/Logo_Linux_Mint.png
	Wk4/FINAL/images/Ubuntu-logo.png
	Wk4/FINAL/images/addcontactbtn.png
	Wk4/FINAL/images/archlinux.png
	Wk4/FINAL/images/branding.png
	Wk4/FINAL/images/bullet.png
	Wk4/FINAL/images/cta.jpg
	Wk4/FINAL/images/dashboardbtn.png
	Wk4/FINAL/images/dashboardbtn2.png
	Wk4/FINAL/images/export.png
	Wk4/FINAL/images/favicon.ico
	Wk4/FINAL/images/fb.png
	Wk4/FINAL/images/footer.jpg
	Wk4/FINAL/images/header.jpg
	Wk4/FINAL/images/hoverbtn.png
	Wk4/FINAL/images/loginbtn.png
	Wk4/FINAL/images/loginbtn2.png
	Wk4/FINAL/images/logo.png
	Wk4/FINAL/images/logoutbtn2.png
	Wk4/FINAL/images/logoutbtnreg.png
	Wk4/FINAL/images/newbtn.png
	Wk4/FINAL/images/newbtn2.png
	Wk4/FINAL/images/newtaskbtn.png
	Wk4/FINAL/images/newtaskbtn2.png
	Wk4/FINAL/images/normalbtn.png
	Wk4/FINAL/images/opensuse-logo.png
	Wk4/FINAL/images/prolistbtn.png
	Wk4/FINAL/images/prolistbtn2.png
	Wk4/FINAL/images/redhat.png
	Wk4/FINAL/images/removebtn.png
	Wk4/FINAL/images/sendbtn.png
	Wk4/FINAL/images/shadow.png
	Wk4/FINAL/images/slide1.jpg
	Wk4/FINAL/images/slide2.jpg
	Wk4/FINAL/images/slide3.jpg
	Wk4/FINAL/images/subfooter.jpg
	Wk4/FINAL/images/tasklistbtn.png
	Wk4/FINAL/images/tasklistbtn2.png
	Wk4/FINAL/images/twitter.png
	Wk4/FINAL/include/connect.php
	Wk4/FINAL/include/fonts/Helvetica.dfont
	Wk4/FINAL/include/fonts/lacuna.ttf
	Wk4/FINAL/include/fonts/oxygen-webfont.eot
	Wk4/FINAL/include/fonts/oxygen-webfont.svg
	Wk4/FINAL/include/fonts/oxygen-webfont.ttf
	Wk4/FINAL/include/fonts/oxygen-webfont.woff
	Wk4/FINAL/include/fonts/oxygen.ttf
	Wk4/FINAL/include/footer.php
	Wk4/FINAL/include/header.php
	Wk4/FINAL/include/join.php
	Wk4/FINAL/include/nav.php
	Wk4/FINAL/include/sidebar.php
	Wk4/FINAL/include/subfooter.php
	Wk4/FINAL/include/subnav.php
	Wk4/FINAL/index.php
	Wk4/FINAL/join.php
	Wk4/FINAL/js/DD_belatedPNG.js
	Wk4/FINAL/js/checkLogin.js
	Wk4/FINAL/js/contacts.js
	Wk4/FINAL/js/cufon-replace.js
	Wk4/FINAL/js/cufon-replace_orig_with_nav.js
	Wk4/FINAL/js/cufon-yui.js
	Wk4/FINAL/js/custom.js
	Wk4/FINAL/js/effects.js
	Wk4/FINAL/js/global_functions.js
	Wk4/FINAL/js/jquery.ceebox-min.js
	Wk4/FINAL/js/jquery.cycle.all.min.js
	Wk4/FINAL/js/jquery.easing.js
	Wk4/FINAL/js/jquery.metadata.js
	Wk4/FINAL/js/jquery.slides.min.js
	Wk4/FINAL/js/loginLogout.js
	Wk4/FINAL/js/main.js
	Wk4/FINAL/js/plugins/jquery.placeholder.min.js
	Wk4/FINAL/js/plugins/jsrender.min.js
	Wk4/FINAL/js/prototype.js
	Wk4/FINAL/js/register.js
	Wk4/FINAL/js/register_ajax.js
	Wk4/FINAL/js/scriptaculous.js
	Wk4/FINAL/js/slides.min.jquery.js
	Wk4/FINAL/js/slimbox2.js
	Wk4/FINAL/js/swfobject.js
	Wk4/FINAL/new-project.php
	Wk4/FINAL/new-task.php
	Wk4/FINAL/project-list.php
	Wk4/FINAL/register.php
	Wk4/FINAL/task-list.php
	Wk4/FINAL/templates/app.html
	Wk4/FINAL/templates/landing.html
	Wk4/FINAL/templates/landing.php
	Wk4/FINAL/xhr/check_login.php
	Wk4/FINAL/xhr/delete_project.php
	Wk4/FINAL/xhr/delete_task.php
	Wk4/FINAL/xhr/get_clients.php
	Wk4/FINAL/xhr/get_projects.php
	Wk4/FINAL/xhr/get_tasks.php
	Wk4/FINAL/xhr/get_user.php
	Wk4/FINAL/xhr/get_user_list.php
	Wk4/FINAL/xhr/index.php
	Wk4/FINAL/xhr/login.php
	Wk4/FINAL/xhr/logout.php
	Wk4/FINAL/xhr/new_client.php
	Wk4/FINAL/xhr/new_project.php
	Wk4/FINAL/xhr/new_task.php
	Wk4/FINAL/xhr/register.php
	Wk4/FINAL/xhr/reqs/auth.php
	Wk4/FINAL/xhr/reqs/common.php
	Wk4/FINAL/xhr/reqs/index.php
	Wk4/FINAL/xhr/reqs/pdo.php
	Wk4/FINAL/xhr/update_client.php
	Wk4/FINAL/xhr/update_project.php
	Wk4/FINAL/xhr/update_task.php
	Wk4/FINAL/xhr/update_user.php
	development/css/main.css
	development/dashboard.php
	development/database2.sql
	development/error_log
	development/humans.txt
	development/images/Logo_Linux_Mint.png
	development/images/Ubuntu-logo.png
	development/images/addcontactbtn.png
	development/images/archlinux.png
	development/images/branding.png
	development/images/bullet.png
	development/images/cta.jpg
	development/images/dashboardbtn.png
	development/images/dashboardbtn2.png
	development/images/export.png
	development/images/favicon.ico
	development/images/fb.png
	development/images/footer.jpg
	development/images/header.jpg
	development/images/hoverbtn.png
	development/images/loginbtn.png
	development/images/loginbtn2.png
	development/images/logo.png
	development/images/logoutbtn2.png
	development/images/logoutbtnreg.png
	development/images/newbtn.png
	development/images/newbtn2.png
	development/images/newtaskbtn.png
	development/images/newtaskbtn2.png
	development/images/normalbtn.png
	development/images/opensuse-logo.png
	development/images/prolistbtn.png
	development/images/prolistbtn2.png
	development/images/redhat.png
	development/images/removebtn.png
	development/images/sendbtn.png
	development/images/shadow.png
	development/images/slide1.jpg
	development/images/slide2.jpg
	development/images/slide3.jpg
	development/images/subfooter.jpg
	development/images/tasklistbtn.png
	development/images/tasklistbtn2.png
	development/images/twitter.png
	development/include/connect.php
	development/include/fonts/Helvetica.dfont
	development/include/fonts/lacuna.ttf
	development/include/fonts/oxygen-webfont.eot
	development/include/fonts/oxygen-webfont.svg
	development/include/fonts/oxygen-webfont.ttf
	development/include/fonts/oxygen-webfont.woff
	development/include/fonts/oxygen.ttf
	development/include/footer.php
	development/include/header.php
	development/include/join.php
	development/include/nav.php
	development/include/sidebar.php
	development/include/subfooter.php
	development/include/subnav.php
	development/index.php
	development/join.php
	development/js/DD_belatedPNG.js
	development/js/checkLogin.js
	development/js/contacts.js
	development/js/cufon-replace.js
	development/js/cufon-replace_orig_with_nav.js
	development/js/cufon-yui.js
	development/js/custom.js
	development/js/effects.js
	development/js/global_functions.js
	development/js/jquery.ceebox-min.js
	development/js/jquery.cycle.all.min.js
	development/js/jquery.easing.js
	development/js/jquery.metadata.js
	development/js/jquery.slides.min.js
	development/js/loginLogout.js
	development/js/main.js
	development/js/plugins/jquery.placeholder.min.js
	development/js/plugins/jsrender.min.js
	development/js/prototype.js
	development/js/register.js
	development/js/register_ajax.js
	development/js/scriptaculous.js
	development/js/slides.min.jquery.js
	development/js/slimbox2.js
	development/js/swfobject.js
	development/new-project.php
	development/new-task.php
	development/project-list.php
	development/register.php
	development/task-list.php
	development/templates/app.html
	development/templates/landing.html
	development/templates/landing.php
	development/xhr/check_login.php
	development/xhr/delete_project.php
	development/xhr/delete_task.php
	development/xhr/get_clients.php
	development/xhr/get_projects.php
	development/xhr/get_tasks.php
	development/xhr/get_user.php
	development/xhr/get_user_list.php
	development/xhr/index.php
	development/xhr/login.php
	development/xhr/logout.php
	development/xhr/new_client.php
	development/xhr/new_project.php
	development/xhr/new_task.php
	development/xhr/register.php
	development/xhr/reqs/auth.php
	development/xhr/reqs/common.php
	development/xhr/reqs/index.php
	development/xhr/reqs/pdo.php
	development/xhr/update_client.php
	development/xhr/update_project.php
	development/xhr/update_task.php
	development/xhr/update_user.php
	psd/Proposal.psd
	psd/Untitled-1.psd
	psd/logo.psd