Fix merge conflict
Basic, ugly dashboard layout
Add gulp stylus workflow, initial Bootstrap dashboard example template