Rocky Balboa
gitignore
resolving merge conflict
fixing merge conflict
another conflict
Merge branch 'dev'

* dev:
  Permalinks!
Merge branch 'dev'

* dev:
  tweak template
  formatted with doc blocks
  added permalinks to clean route
Merge branch 'dev'

* dev:
  changed default env to dev
updated gitignore