Merge pull request #4 from stephaniecoleman/template

Template
Fix merge conflict.
Merge branch 'bastard' of github.com:stephaniecoleman/AngelHub into bastard
Make flash alerts and notices fade out after they appear on the screen.
Buttons fixed
Deleted pics