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

Conflicts:
	Booksmart/en.lproj/MainStoryboard_iPhone.storyboard
commit
test
Merge branch 'master' of https://github.com/LamLu/Booksmart