first commit
Merge https://github.com/alexwalling/Twitter_Fridge