Allan Update
Merge branch 'master' of https://github.com/aklo/Biofem

Conflicts:
	dashboard.html
	data.html
	index.html
Allan Update Merge