Migrations
Merge branch 'migrations' into Development

Conflicts:
	.gitignore
Merge branch 'Development' of https://github.com/oSoc14/code9000 into Development