first steps (following rails tutorial)
Merge branch 'master' of github.com:bipson/ndrsBoard

Conflicts:
	.gitignore