Changed the README.md
Just a change, as requested
Added all the rails stuff.
Finished adding rails files.
Merge pull request #2 from messes/master

Changed the README.md
Merge branch 'master' of git://github.com/amirian28/hackathon

Conflicts:
	README.md
New generated site.
.gitignore: Changed from hackathon to jetzt-site, and added a new rule
to exclude .lock files.
account.rb: Added an account model.

comment.rb: Added a comment model.

product.rb: Added a product model.

startup.rb: Added a startup model.
Merge remote-tracking branch 'mike/master'
account_controller.rb: Controller for accounts.

welcome_controller.rb: Index page controller.

index.html.erb: Index page.

config/routes.rb: Added the index to routes.
Merge branch 'master' of git://github.com/vianuevm/hackathon
signups_controller.rb: Made a controller for the signup page.

accounts/index.html.erb: Made a view for the account page.
The signup form works writing to the database.
Kind of made the layout.
Okay, actually put my files on the repo.
Merge branch 'master' of git://github.com/messes/hackathon

Conflicts:
	jetzt-site/app/views/welcome/index.html.erb
	jetzt.html
Not sure what I'm committing ...
Merge branch 'master' of git://github.com/messes/hackathon
Merge branch 'master' of git://github.com/trozamon/hackathon