Merge branch 'master' of https://github.com/cramja/stocktracker

Conflicts:
	stocktracker/__pycache__/urls.cpython-33.pyc
	stocktracker/__pycache__/views.cpython-33.pyc
	stocktracker/urls.py
	stocktracker/views.py
Upgraded to version .3

The site is now divided into apps with different functionality
apps are pluggable so we can work on one app without messing up the functionality of another