fisrt commit
Merge https://github.com/jak3/personal_stuff

Conflicts:
	README