Fack

Conflicts:
css/application.css
css/bootstrap/application.less
css/components.css
css/components/helpers.less
js/application.min.js
Merge branch 'master' of https://github.com/RyanThompson/AIWS

Conflicts:
	css/application.css
	css/bootstrap/application.less
	css/components.css
	css/components/helpers.less
	js/application.min.js