third git

ungit ftw
Merge branch 'third'