I didn't like the order of operations
Merge pull request #2 from qiuey00/jeff/some_p6_changes

I didn't like the order of operations
Merge remote-tracking branch 'origin/master' into nick/much_more_awesomer_implementation

Conflicts:
	p6.rb