Added macro functions functions
Merge branch 'master' of https://github.com/alcinnz/WyWeb

Conflicts:
	html/index.html