Merge branch 'develop' of https://github.com/Trrnts/Trrnts
Initial Setup of Angular App
Merge branch 'submitMagnetLink' of https://github.com/Trrnts/Trrnts into basicIndexAngular
Add ng-view to index.html
Implement backend for submitting magnet links
Merge branch 'basicIndexAngular' into develop
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into submitServer
Merge branch 'submitServer' into develop
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop
Create mangetLink Factory for Submit & add ui-router
Add key magnets:top and rename ps to score
Merge branch 'DBLayout' into develop
Fix Syntax Issues
Resolve Issues Regarding Angular Modules
Implement basic DHT
Merge branch 'crawler' into develop
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into submitMagnetLink

Conflicts:
	client/index.html
Merge branch 'submitMagnetLink' into develop
Fix bad merge
Add comments for clarification