Merge branch 'master' of https://github.com/chrstphrwllc/finval

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	__init__.py
	epydoc-pdf.conf
	epydoc.conf
	get_google_quote.py
	moira-fixed/__init__.py
	moira-fixed/epydoc-pdf.conf
	moira-fixed/epydoc.conf
	moira-fixed/get_google_quote.py
	moira-fixed/nukaquant.py
	moira-fixed/price_check_sample.py
	moira-fixed/readme.md
	moira/__init__.py
	moira/epydoc-pdf.conf
	moira/epydoc.conf
	moira/get_google_quote.py
	moira/nukaquant.py
	moira/price_check_sample.py
	moira/readme.md
	moira/trade_sample.py
	nukaquant.py
	price_check_sample.py
	readme.md
Merge branch 'master' of https://github.com/chrstphrwllc/finval

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	__init__.py
	epydoc-pdf.conf
	epydoc.conf
	get_google_quote.py
	moira-fixed/__init__.py
	moira-fixed/epydoc-pdf.conf
	moira-fixed/epydoc.conf
	moira-fixed/get_google_quote.py
	moira-fixed/nukaquant.py
	moira-fixed/price_check_sample.py
	moira-fixed/readme.md
	moira/__init__.py
	moira/epydoc-pdf.conf
	moira/epydoc.conf
	moira/get_google_quote.py
	moira/nukaquant.py
	moira/price_check_sample.py
	moira/readme.md
	moira/trade_sample.py
	nukaquant.py
	price_check_sample.py
	readme.md