Added error page
Merge conflict
ignore this
merge conflict
added freakin comma
Merge branch 'master' of https://github.com/RyanPhillips10/3024u
Success page