test commit

Initial commit to test Git. Should have no impact to code. Added images
to sg_assets to be used in a later commit.
Merge branch 'master' of https://github.com/sharpobject/sgre
test commit

rough function added (but not used) to test git commits.
implement border #2, ribbon border

Ribbon border now used where appropriate. Add code and assets for main
menu image buttons, but not used.
removed my keys and db
Merge branch 'master' of https://github.com/sharpobject/sgre
Merge? idk
Bugfixes for old stuff i forgot to bugcheck
EP9
Remove tabs
Merge branch 'notmaster'

* notmaster:
  Remove tabs
  EP9
  Bugfixes for old stuff i forgot to bugcheck

Conflicts:
	characters.lua
	skills.lua
Some ep9 stuff
ep9 dungeon stuff
Squashed commit of the following:

commit 6aa8bb80a4bb56f5a8ba646e7a4a915794265a0a
Author: tried42long <tried42long@users.noreply.github.com>
Date:   Tue Oct 21 02:30:17 2014 -0700

    User panel and Fight message commit

    new User panel feature and Fight message

commit 89347a751f92b1894bc7777a770df9bd867fb9b6
Author: tried42long <tried42long@users.noreply.github.com>
Date:   Thu Oct 2 01:40:45 2014 -0700

    Dangerous commit - graphic.lua is eating all of the memory

    please check graphics.lua/make_player_info() for memory leak

commit 1b59490e8d034859179b984b4a24949009ca9bc6
Author: tried42long <tried42long@users.noreply.github.com>
Date:   Thu Sep 11 03:50:07 2014 -0700

    remove windows config

    remove windows config

commit 09fc6953b8ae0eb553cadd2cf44d0ff080e97d36
Author: tried42long <tried42long@users.noreply.github.com>
Date:   Thu Sep 11 03:40:27 2014 -0700

    add Lobby menu bar

    adjust main lobby to feature an image menu bar

commit 7270e67c474ea66021ec9200fb4b3fba81d2528b
Author: tried42long <tried42long@users.noreply.github.com>
Date:   Mon Sep 8 01:46:55 2014 -0700

    merge with master
Add ep9 dungeon to dungeon screen
Merge remote-tracking branch 'faketried/squashed'

* faketried/squashed:
  Squashed commit of the following:
  removed my keys and db
  implement border #2, ribbon border
  test commit
  test commit

Conflicts:
	mainloop.lua