Adding a todo per Erik's suggestion
Merge remote-tracking branch 'origin/master'

Conflicts:
	stack-calc/.idea/workspace.xml
Adding a todo per Erik's suggestion