no need for war
Merge branch 'master' of https://github.com/lulock/FunTimes

Conflicts:
	StockWatcher/war/StockWatcher.html