adding migrations
adding migtrations
fixing migrations
deleting strang file named x
deleting strang file named x
Merge branch 'master' into database_migrations

Conflicts:
	tutor/db/schema.rb
Issues #412 #413
fixing .gitignore
removing migrations
Merge branch 'database_migrations' into dev_database

Conflicts:
	tutor/db/migrate/20140323112245_create_problems.rb
removing migratoins
adding keys to progress table
Merge branch 'database_migrations' into dev_database

Conflicts:
	tutor/db/migrate/20140506131804_create_contest_progresses.rb
removing extra tab
Merge pull request #427 from alaashafaee/dev_database

Dev database