test
Merge branch 'master' of https://github.com/LamLu/Booksmart

Conflicts:
	.DS_Store