edited sample controller
Merge remote-tracking branch 'origin/master'
edited sample ctrl
Merge branch 'master' of https://github.com/supersoaker/node-mvc

Conflicts:
	server/App.js
	server/App/Controller/Sample.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
edited model and database structure