server
Merge branch 'master' of https://github.com/AASP/temp

Conflicts:
	README.md
	images/Home automation icons.jpg
	images/pic01.jpg
	images/pic02.jpg
	images/pic03.jpg
	images/pic04.png
	images/pic04bak1.jpg
	images/pic05.jpg
	images/pic06.jpg
	index.html
	index.html~
	left-sidebar.html