Make routes folder/reorganize things
Merge branch 'master' of https://github.com/chrisjbaik/sawadicop

Conflicts:
	views/song.php