silly layout v2.0
merged mac stuff
Merge branch 'master' of https://github.com/kevin-roark/adhoc-x2
calendar hr fix