initital
added cukes framework
resolved gitignore merge conf
added travis config file
new develop branch - added travis.yml
Merge branch 'develop' of https://github.com/AgileVentures/codealia
Merge pull request #2 from PeteBoucher/develop

great work Pete!
added assets and cleaned up Gemfile from comments
added images to assets
stripped out RubyMine settings folder
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
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