resolved differences
Merge branch 'master' of github.com:johns996/NMU-Responsive-Omega
change to production
Merge branch 'dev-eric'
Merge branch 'dev-eric'
better sidebar sizing
fix for firefox window size detection
tighten up paragraph and list spacing
Merge branch 'master' of github.com:johns996/NMU-Responsive-Omega
added table-layout