Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
25 changes: 24 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,24 @@
# SuperCoolProject
# SuperCoolProject

<<<<<<< HEAD
Guys im having second thoughts, this might not be as cool as I thought.

<<<<<<< HEAD
Chase Caldwell
=======
I am loving this lab!!!

Chase Caldwell
>>>>>>> origin/waitisthiscool
=======
Hello! Glad to see my homework repo is still being used. Maybe check out some of the other garbage I have kicking around on here?

Pro tips for getting an A in Dr.Cerny's class.

1. Study those 200 slide powerpoints like the bible
2. When studying go for understanding the content, not memorizing
3. Master git and design patterns.
4. You dont realize it now, but java streams are king.

Do me a favor, if everyone here can tell Professor Fry congradulations on retirement, im sure she would be very greatful.
>>>>>>> bcb747a (Update README.md)
8 changes: 8 additions & 0 deletions hello.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include <iostream>

int main() {
std::cout << "Hello, World!" << std::endl;
return 0;
}


5 changes: 5 additions & 0 deletions hello_world.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include <iostream>
int main() {
std::cout << "Hello, World!" << std::endl;
return 0;
}