first commit
readme
added vimrc
created template
added config file
init
init
Merge branch 'master' of github.com:adamwong246/Castle-Shuri
cleanup
removed duplicate
cleanup
removed errorlog
Merge branch 'master' of https://github.com/adamwong246/shuri

Conflicts:
	home/.vimrc
update time
Merge branch 'master' of https://github.com/adamwong246/shuri
redo