#21: Added in chosen to html mockups
#52
#52: Added in index2.html to try to figure out what do
#52: I think this works
#52: Everything works, but too lazy to go  through all possibilities.
#52: Refactored
#52: merge conflict
#52: Merge conflict
#52
#52: Fixed the font size
Merge branch 'master' into chosen
Merge branch 'master' into chosen

Conflicts:
	TaskHistory.userprefs
Merge branch 'master' into chosen
Merge branch 'master' into chosen

Conflicts:
	TaskHistory.userprefs
#52: added in chosen
committing userprefs
fixed merge
deleted html mockups
Merge pull request #75 from rhsu/chosen

Chosen