Settings V1
Merge branch 'master' of https://github.com/grifontimhakaton/hakatonnis2014