Initial commit
Add microblog scafolding
Resolve conflicts