moved user's notes dir to be in project dir
added sample mk files in user's notes dir
dummy change to force a deploy
removing sqlite3 gem
no more requiring activerecord
refreshing notes samples
refreshing notes folder
added how to deploy on heroku
ignoring .DS_store files

Conflicts:

	.gitignore
removed useless comments
added the possibility for a 4th level in url's
refreshed to newer file
improved notes on China
Merge branch 'h-deploy'

Conflicts:
	.gitignore
	README.rdoc
routing: now uses a path param which can have slashes in it
config: updates rails to v3.2.14 + adds bg image
removes notes folder content