.gitignore~~~
Merge branch 'master' of https://github.com/delihiros/design-project
fix bugs