Set up the main page and the armies page basic format.

Working on the style for the armies page and the main page and will finish up
the hobbies page next. Changed all the images to .png. Made changes in the
admin, models, test, urls, views. Also typed up all the army data into the
database.
Merge branch 'Development' of https://github.com/jacobznolan/Warhammer40k into development

Conflicts:
	Army.db - fix
	WH40k/admin.py - fix
	WH40k/tests.py - fix
	WH40k/urls.py - fix
Merge branch 'Development' of https://github.com/jacobznolan/Warhammer40k into development

Conflicts:
	Army.db - fix
	WH40k/admin.py - fix
	WH40k/tests.py - fix
	WH40k/urls.py - fix
Merge branch 'development' of https://github.com/Jhick6671/Warhammer40k into development