Merge branch 'master' into autoawesome

Conflicts:
	js/bootstrapper.js
	styles/css/styles.css
	styles/sass/_songList.scss
	templates/songList.html

trying to resolved merge conflict. merging the wrong direction tho >.<