changes
merge conflict
added conf.home for awesome.