Initial commit - Setup app and basic dashboard UI
Word controller/views in Dashboard
Fix conflict