tingtest
added article to space for testing purposes
commit before new branch. moving to foundation instead of bootstrap
removed big video
ting commit
Merge branch 'tingtest' of github.com:IanHung/html5test into tingtest
going to implement imageoption reveal on hover
Merge branch 'tingtest' into dev

Conflicts:
	forum/models.py
	sqlite.db
	static/html5test/css/custom.css
	templates/base.html

Conflicts resolved
	timeview/templates/timeview/time.html
Merge pull request #8 from IanHung/dev

Dev
Merge branch 'master' into Ian

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