3 commits

Author	SHA1	Message	Date
Yoko Hyakuna	dded969da6	Merge master	2018-01-30 09:57:30 -08:00
Yoko Hyakuna	470e913af7	resolved the file name conflict	2018-01-29 16:41:44 -08:00
Yoko Hyakuna	1a532cb993	Re-categorized the guides on the navigation	2018-01-26 15:13:15 -08:00