"merged config"
Merge branch 'master' of https://github.com/cohen990/angelhack-2014

"update"