Merge branch 'develop'
Remove href to magnet link
Merge branch 'hotfix'
Merge branch 'develop'
Merge branch 'master' of https://github.com/Trrnts/Trrnts
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Add comments to bootstrap and router
Add comments to bootsrap router and controller
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into addComments

Conflicts:
	bootstrap.js
	client/js/controllers.js
	server/router.js
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into addComments

Conflicts:
	client/js/controllers.js
Merge branch 'addComments' into develop
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop

Conflicts:
	client/js/controllers.js