Add twitter bootstrap, refacor testing
Finish layout and routes
Finish layout and routes post merge conflict