Reseting my boo-boo
Merge branch 'master' of https://github.com/grex22/ridewalk-theme

Conflicts:
	themes/ridewalk/assets/css/main.min.css
	themes/ridewalk/assets/sass/app.scss
	themes/ridewalk/lib/scripts.php