first commit, added gitignore so i dont lose my master branch
uploading skeleton
fixed gitignore merge conflict
all database stuff working and seeded
Merge pull request #4 from mhuerster/master

README
Merge pull request #5 from rantoniops/antonio_forked

Antonio forked - still working on the seed, file, 15 mins