Signed-off-by: beango <6588617@gmail.com>
Merge branch 'master' of https://github.com/beango/beango.github.com.git

Conflicts:
	archive.html
	atom.xml

Signed-off-by: beango <6588617@gmail.com>