django launcher icons
Merge branch 'master' of https://github.com/College-Living/College-Living.git
ApartmentListActivity initial
Merge branch 'master' of https://github.com/College-Living/College-Living.git
settings screen
Added pads and setting tiles onClick
Merge branch 'Blake'
updated settings and pads