work done till May 10th
Merge branch 'Ian' into dev

Conflicts:
	README.md
	forum/models.py
	static/html5test/css/custom.css
	templates/base.html
	timeview/templates/timeview/time.html

May10th
Merge branch 'tingtest' into dev

Conflicts:
	static/html5test/css/custom.css
	static/html5test/js/custom.js
	templates/base.html

May 10th
ok
Merge branch 'Ian' into dev

Conflicts:
	README.md
	forum/models.py
	sqlite.db
	static/html5test/css/custom.css
	timeview/templates/timeview/time.html
dfds
deleted unused css
Fixed the javascript.
Created Models for article class.
Moved comment ajax response to forum head.