no message
Merge branch 'master' of https://github.com/riahu/Final

Conflicts:
	details.html
no message