Added urls to website/urls.py instead of upe/urls.py
Added currentofficers view structure (not yet populated)
Added position and photo to Officer model
Merge remote-tracking branch 'upstream/master' into current-officers

Conflicts:
	upe/urls.py
	website/views.py
Finished Current Officers Page #9

1. Fixed Officer Model to include position.
2. Completed officer method in website/views.py.
3. Added media & static path to upe/urls.py so that media and static files will be served from MEDIA_ROOT and STATIC_ROOT correctly.

IMPORTANT: Add the following lines to upe/settings.py:

STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATIC_URL = '/static/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'

(See picture for more information.)

Note: You must install Pillow (pip install pillow) in order for image uploading/serving to process correctly.
https://pypi.python.org/pypi/Pillow
Merge pull request #12 from upenu/current-officers

Current Officers Page