add devise, devise User, twitter-bootstrap and rpec
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore