Comment Genre & top 100 links
Merge branch 'master' of https://github.com/gswetha/cs2102

Conflicts:
	application/views/admin_edit.php
	application/views/admin_edit_songNotify.php
	application/views/composermenu.php
	application/views/songmenu.php
	application/views/songmenu_rankSongs.php