works maybe, but running rake db:reset might f things up by adding a tmp file no-one wants
added admin page, there would have been more commits, but there was a merge conflict we worked around by doing it all on new branch
removed testing text
Merge remote-tracking branch 'origin' into admintwo
indented part of html correctly
the bug in login was fixed, now can get back to mergining this branch
Merge remote-tracking branch 'origin' into admintwo

Conflicts:
	app/controllers/apis_controller.rb
	public/index.html
Merge remote-tracking branch 'origin' into admintwo
added dev_homepage, key_required, endpoint_url, and category fields to admin page
adding an api on admin page redirects to homepage when submit is clicked
added header to Admin page
Merge remote-tracking branch 'origin' into admintwo
Merge remote-tracking branch 'origin' into admintwo
fixed indentation issues and unnecessary initialize method
Merge pull request #61 from mule-deer-2014/admintwo

Admintwo OK PHIL