adding bs modal
Merge branch 'master' into feature/adding-tweet-modal

Conflicts:
	views/index.jade
added tweets to a modal
Merge branch 'feature/adding-tweet-modal'
moved some text