Merge branch 'master' of https://github.com/Trrnts/Trrnts into develop
Comment out buggy geolocate code. Add extra comments for bencoded message object
Add templated files for latest, top and submit magnets
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into addUiRouter
Remove padding-bottom on main header
remove unnecessary parameters for pushPeersToGeoQueue
Fix bug: Respond with magnets in correct order
Add updated dist folder
Move nested views logic into main.js
Move html from views to their own template files
Add World Map Directive
Add main.js and main.tpl.html
Move latestMagnets html into its own template
Move submitMagnet into its own template
Move topMagnets into its own template
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into addUiRouter

Conflicts:
	client/dist/main.js
	client/dist/main.min.js
	client/dist/main.min.js.map
	client/index.html
	client/js/app.js
Merge branch 'addUiRouter' into develop
Update dist folder
Remove merge conflict file from index
Highlight bar on hovering