Fixed a couple issues with remaining git merge conflict code left in the index.html and create.html pages. Fixed layout on manage.html page.
Merge branch 'master' of https://github.com/AustinClift/DigitalFlash into 54clift_randomStack

# By Clint Losee
# Via Clint Losee
* 'master' of https://github.com/AustinClift/DigitalFlash:
  Fixed a couple issues with remaining git merge conflict code left in the index.html and create.html pages. Fixed layout on manage.html page.

Conflicts:
	app/index.html
	app/views/create.html