Merge branch 'master' of github.com:edlongman/whileaway

Conflicts:
	site/include.php
edited webpage
Update index.html

shh
Merge commit 'bb7366c26fbba67941697a6112ab49ccde746fb3'
Merge branch 'master' of https://github.com/edlongman/whileaway
Test the ajax thingie

Little ajax test. Call 'test()' at the console.
Added weeks

You can now jump back in weeks

- added weeks option to switch
added stuff
Merge branch 'master' of https://github.com/edlongman/whileaway
added python librarie
Merge branch 'master' of github.com:edlongman/muzzle
Object-oriented

Made get.js more object oriented by removing global attributes. Documentation is yet to come.
	new file:   feedparser.pyc
	modified:   rss_log.py
	modified:   site/test.html
added file
fixed conflictts
Merge branch 'master' of https://github.com/edlongman/whileaway

Conflicts:
	rss_log.py

	modified:   rss_log.py
added logo for webpage, and updated it
Merge branch 'master' of github.com:edlongman/muzzle
Replaced index.html with natural language form
Merge branch 'master' of github.com:edlongman/muzzle