Working on getting some sort of table in the view
Merge branch 'master' of https://github.com/jtf323/AndroidAppTest