Fixed conflict of merge
Merge branch 'flask' of /home/sam/gene

Conflicts:
	wqflask/wqflask/templates/index_page.html
Added fubar to the top of notes.txt
Removed foobar from top of notes.txt