Project initialization
Project bootstrap
A lot of work on different areas
Merge branch 'master' of github.com:mariochavez/conference

Conflicts:
  .gitignore