Signed-off-by: maniax89 <andrew.p.turgeon@gmail.com>
Merge branch 'master' of github.com:maniax89/andrewturgeon

Conflicts:
	.gitignore