After solving the conflicts
After solving the conflicts
Merge branch 'master' of https://github.com/claudey/gcdc into aliu
A few text changes in index file
Merge branch 'master' of https://github.com/claudey/gcdc into aliu
After working on issue creating logic
After working on the issue creating logic
After working on signup for users
Putting a log in user id into a session
Merge branch 'master' of https://github.com/claudey/gcdc into aliu
Log out script
Merge branch 'master' of https://github.com/claudey/gcdc into aliu
Merge branch 'master' of https://github.com/claudey/gcdc into aliu
Officials can now create achievements
Merge branch 'master' of https://github.com/claudey/gcdc into aliu
merged conflicts in the official.php file