updates
Merge branch 'master' of http://github.com/schoi21c/resources

Conflicts:
	bashrc
	vimrc