some fix
Merge branch 'gh-pages' of github.com:jackylee0424/taiwanuxd into gh-pages

Conflicts:
	index.html
	js/firefeed-ui.js