removed non jsjrobotics work
Merge branch 'master' of https://github.com/jsjrobotics/FourthBranch

Conflicts:
	documents/DetailedToDo.txt
	documents/technical_specifications_phase1.docx
	frontend/css/css.css
	frontend/css/css.scss
	frontend/footer.php
	frontend/header.php
	frontend/inc/functions.php
	frontend/inc/loginModal.php
	frontend/inc/paypalProcess.php
	frontend/inc/process_login.php
	frontend/inc/register.inc.php
	frontend/js/mainJs.js
	frontend/tbladmin/add.bill.php
	frontend/tbladmin/header.php
	frontend/tbladmin/index.php
	frontend/tbladmin/leftbar.php