fixes and polish
final fixes
kylefinalize
Merge pull request #12 from kmahal/master

final kmahal fixes
fixed erics merge
kyles integrated
cleaned up the file directory
fixed side bar tapping issue
final changes before submittal