application helper on server
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
removed e+px
resolved conflicts
resolved conflicts
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
Merge branch 'master' of https://github.com/beck03076/organizor
local change to app.css
Merge branch 'master' of https://github.com/beck03076/organizor

Conflicts:
	app/assets/stylesheets/application.css
production changes