fixed misplaced action button
Merge pull request #29 from yenbryan/peterdev

fixed misplaced action button
added more testing
Merge pull request #30 from yenbryan/dev-bryan

whoa, lots of file changes
merge with developer