add the directory which i forgot to add earlier
add note
change year to 2013
gonna get a conflict
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md