first commit
all is well
set up for heroku
Merge pull request #3 from clang1234/master

Move css out of index and into minfied css
 visual changes to index with bootstrap. Added about.html.eex. Adjusted route to allow for about page.
Modified mix file to work with Elixir Master (0.10.2-dev)
Remote .DS_Store files
Merge hayduke/elixir_dallas_web repo
Update deps versions
Move common template code to a layout
Clean up unused files
Merge pull request #5 from pstutes/master

Modified mix file to work with Elixir Master (0.10.2-dev)
Merge branch 'merge_duke'

* merge_duke:
  Clean up unused files
  Move common template code to a layout
  Update deps versions
  Remote .DS_Store files
  visual changes to index with bootstrap. Added about.html.eex. Adjusted route to allow for about page.
  set up for heroku
  all is well
  first commit

Conflicts:
	mix.exs
	mix.lock