Merge branch 'whack' into development
added new get API
return approved tweets
-_-
added back locking on db operations
Merge branch 'newapi' into development