Small changes to Table View
merge conflicts..
STUPID MERGENSJDFNJSDF
Changed some table shit
Merged master to my branch