livesense last
Merge branch 'master' of https://github.com/mary522hiro/programming

Conflicts:
	yahoo_dir/.DS_Store