Merge pull request #2 from PeteBoucher/develop

great work Pete!
added images to assets
added img assets for codealia
updated gitignore to ignore .idea, switched to Postgres
Merge pull request #3 from tochman/develop

Thanks for the Assets Thomas :)
merged with upstream/develop
Update README.md
Merge pull request #4 from yggie/develop

Use PostgreSQL, cuz its awesome
added old scaffold html code fot index
Merge pull request #5 from tochman/develop

Assets
Merge remote-tracking branch 'upstream/develop' into develop
added skeleton code for internationalization
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #6 from yggie/develop

Internationalization
first cuke is going RED on me. Not a good sign ;-)
Merge remote-tracking branch 'thomas/develop' into develop
'Create a website' feature complete.
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #7 from coloradobum/develop

Finished "Create a website" Feature, travis doesn't seem to be working
Changed Ruby version in travis.yml to just 2.0.0