lei
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main
asfdf
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main

Conflicts:
	lib/.DS_Store