Don't remember these changes lol
Merge branch 'button' of https://github.com/kbutton16/sample_app into button