Initial commit
Ignoring emacs backups
Added unicorn application server framework
Fixed type in unicorn file
Changing unix socket location for communication between unicorn and nginx
Gemfile.lock changed for some reason
added newline to gitignore
Added simple multiple inheritance to tables
Added attribute aliases to model subclasses
Added users
Linked users and media
Jeni I got your number!
Migrated the database
Added Home Controller
Linked home controller to root path
Merge branch 'master' of ssh://github/felgenh3/market

Conflicts:
	.gitignore