hehe
Merge branch 'Samoo' of https://github.com/SamuelChien/home into Samoo

Conflicts:
	README.md