updating repo. the first commit in a long time  :3
Merge branch 'master' of https://github.com/jensenr30/De_Flux

Conflicts:
	.gitignore
	De_Flux.layout